--- otp_src_17.3/erts/emulator/hipe/hipe_x86_signal.c
+++ b/erts/emulator/hipe/hipe_x86_signal.c
@@ -220,16 +220,15 @@
 #include <dlfcn.h>
 static int (*__next_sigaction)(int, const struct sigaction*, struct sigaction*);
 #define init_done()	(__next_sigaction != 0)
-#define __SIGACTION _sigaction
+#define __SIGACTION __sigaction
 static void do_init(void)
 {
-    __next_sigaction = dlsym(RTLD_NEXT, "_sigaction");
+    __next_sigaction = dlsym(RTLD_NEXT, "__sigaction");
     if (__next_sigaction != 0)
 	return;
     perror("dlsym");
     abort();
 }
-#define _NSIG NSIG
 #define INIT()	do { if (!init_done()) do_init(); } while (0)
 #endif	/* not glibc or darwin */
 
--- otp_src_17.3/erts/emulator/sys/common/erl_poll.h
+++ b/erts/emulator/sys/common/erl_poll.h
@@ -127,6 +127,7 @@
 #elif ERTS_POLL_USE_EPOLL	/* --- epoll ------------------------------- */
 
 #include <sys/epoll.h>
+typedef unsigned int __uint32_t;
 
 #define ERTS_POLL_EV_E2N(EV) \
   ((__uint32_t) (EV))
--- otp_src_17.3/lib/erl_interface/src/connect/ei_resolve.c
+++ b/lib/erl_interface/src/connect/ei_resolve.c
@@ -642,15 +642,11 @@
 #ifndef HAVE_GETHOSTBYNAME_R
   return my_gethostbyname_r(name,hostp,buffer,buflen,h_errnop);
 #else
-#if (defined(__GLIBC__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__) || defined(__ANDROID__))
   struct hostent *result;
 
   gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop);
 
   return result;
-#else
-  return gethostbyname_r(name,hostp,buffer,buflen,h_errnop);
-#endif
 #endif
 #endif
 }
--- otp_src_17.3/make/install_bin
+++ b/make/install_bin
@@ -81,11 +81,6 @@
     test "$tst" = "" || echo "{error,{arg,missing_bindir}}." > $tst
     exit 1
 }
-test "$exec_prefix" != "" || {
-    echo " ERROR: Missing --exec-prefix" 1>&2
-    test "$tst" = "" || echo "{error,{arg,missing_exec_prefix}}." > $tst
-    exit 1
-}
 test "$erlang_bindir" != "" || {
     echo " ERROR: Missing erlang_bindir" 1>&2
     test "$tst" = "" || echo "{error,{arg,missing_erlang_bindir}}." > $tst
@@ -101,7 +96,7 @@
 	"")
 	    # Empty DESTDIR or EXTRA_PREFIX which is ok
 	    case $dir_var in
-		DESTDIR|EXTRA_PREFIX) ;;
+		exec_prefix|DESTDIR|EXTRA_PREFIX) ;;
 		*)
 		    echo " ERROR: Internal error: \$$dir_var is empty" 1>&2
 		    test "$tst" = "" || echo "{error,{empty,$dir_var}}." > $tst
